Auto merge of #3478 - alexcrichton:lift, r=brson

Lift up workspace rlibs while building

I think the condition here was slightly off from before, so invert it subtly to
get what we want, lifting up anything in a workspace or binaries otherwise.

Closes #3432

diff --cc src/cargo/ops/cargo_rustc/context.rs
Simple merge